2a50198a8cad972080ab696dbe72fd3fe1fbe1c9,features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/src/main/java/org/opennms/features/topology/plugins/topo/linkd/internal/LldpLinkStatusProvider.java,LldpLinkStatusProvider,getEdgeAlarmSummaries,#List#,63
Before Change
protected List<EdgeAlarmStatusSummary> getEdgeAlarmSummaries(List<Integer> linkIds) {
List<LldpLink> links = m_lldpLinkDao.findLinksForIds(linkIds);
Map<String, EdgeAlarmStatusSummary> summaryMap = new HashMap<String, EdgeAlarmStatusSummary>();
for (LldpLink sourceLink : links) {
OnmsNode sourceNode = sourceLink.getNode();
LldpElement sourceElement = sourceNode.getLldpElement();
for (LldpLink targetLink : links) {
OnmsNode targetNode = targetLink.getNode();
LldpElement targetLldpElement = targetNode.getLldpElement();
//Compare the remote data to the targetNode element data
boolean bool1 = sourceLink.getLldpRemPortId().equals(targetLink.getLldpPortId()) && targetLink.getLldpRemPortId().equals(sourceLink.getLldpPortId());
boolean bool2 = sourceLink.getLldpRemPortDescr().equals(targetLink.getLldpPortDescr()) && targetLink.getLldpRemPortDescr().equals(sourceLink.getLldpPortDescr());
boolean bool3 = sourceLink.getLldpRemChassisId().equals(targetLldpElement.getLldpChassisId()) && targetLink.getLldpRemChassisId().equals(sourceElement.getLldpChassisId());
boolean bool4 = sourceLink.getLldpRemSysname().equals(targetLldpElement.getLldpSysname()) && targetLink.getLldpRemSysname().equals(sourceElement.getLldpSysname());
boolean bool5 = sourceLink.getLldpRemPortIdSubType() == targetLink.getLldpPortIdSubType() && targetLink.getLldpRemPortIdSubType() == sourceLink.getLldpPortIdSubType();
if (bool1 && bool2 && bool3 && bool4 && bool5) {
summaryMap.put(sourceNode.getNodeId() + ":" + sourceLink.getLldpPortIfindex(),
new EdgeAlarmStatusSummary(sourceLink.getId(),
targetLink.getId(), null)
);
}
}
}
List<OnmsAlarm> alarms = getLinkDownAlarms();
for (OnmsAlarm alarm : alarms) {
String key = alarm.getNodeId() + ":" + alarm.getIfIndex();
if (summaryMap.containsKey(key)) {
EdgeAlarmStatusSummary summary = summaryMap.get(key);
summary.setEventUEI(alarm.getUei());
}
}
After Change
protected List<EdgeAlarmStatusSummary> getEdgeAlarmSummaries(List<Integer> linkIds) {
List<LldpLink> links = m_lldpLinkDao.findLinksForIds(linkIds);
Multimap<String, EdgeAlarmStatusSummary> summaryMap = HashMultimap.create();
for (LldpLink sourceLink : links) {
OnmsNode sourceNode = sourceLink.getNode();
LldpElement sourceElement = sourceNode.getLldpElement();
for (LldpLink targetLink : links) {
OnmsNode targetNode = targetLink.getNode();
LldpElement targetLldpElement = targetNode.getLldpElement();
//Compare the remote data to the targetNode element data
boolean bool1 = sourceLink.getLldpRemPortId().equals(targetLink.getLldpPortId()) && targetLink.getLldpRemPortId().equals(sourceLink.getLldpPortId());
boolean bool2 = sourceLink.getLldpRemPortDescr().equals(targetLink.getLldpPortDescr()) && targetLink.getLldpRemPortDescr().equals(sourceLink.getLldpPortDescr());
boolean bool3 = sourceLink.getLldpRemChassisId().equals(targetLldpElement.getLldpChassisId()) && targetLink.getLldpRemChassisId().equals(sourceElement.getLldpChassisId());
boolean bool4 = sourceLink.getLldpRemSysname().equals(targetLldpElement.getLldpSysname()) && targetLink.getLldpRemSysname().equals(sourceElement.getLldpSysname());
boolean bool5 = sourceLink.getLldpRemPortIdSubType() == targetLink.getLldpPortIdSubType() && targetLink.getLldpRemPortIdSubType() == sourceLink.getLldpPortIdSubType();
if (bool1 && bool2 && bool3 && bool4 && bool5) {
summaryMap.put(sourceNode.getNodeId() + ":" + sourceLink.getLldpPortIfindex(),
new EdgeAlarmStatusSummary(sourceLink.getId(),
targetLink.getId(), null)
);
}
}
}
List<OnmsAlarm> alarms = getLinkDownAlarms();
for (OnmsAlarm alarm : alarms) {
String key = alarm.getNodeId() + ":" + alarm.getIfIndex();
if (summaryMap.containsKey(key)) {
Collection<EdgeAlarmStatusSummary> summaries = summaryMap.get(key);
for (EdgeAlarmStatusSummary summary : summaries) {
summary.setEventUEI(alarm.getUei());
}
}